gl render ops: Rename a member
authorTimm Bäder <mail@baedert.org>
Fri, 24 Nov 2017 09:24:49 +0000 (10:24 +0100)
committerTimm Bäder <mail@baedert.org>
Thu, 21 Dec 2017 18:12:31 +0000 (19:12 +0100)
gsk/gl/gskglrenderer.c
gsk/gl/gskglrenderops.c
gsk/gl/gskglrenderopsprivate.h

index 66dcfeba6ae5ac87915e4d26df8f520ade8a5c73..ccbc659fc120ff6ff254ef00fdb5320ce84878f2 100644 (file)
@@ -1184,8 +1184,8 @@ gsk_gl_renderer_render_ops (GskGLRenderer *self,
 
         case OP_DRAW:
           OP_PRINT (" -> draw %ld, size %ld and program %s\n",
-                    op->draw.vao_offset, op->draw.draw_size, program->name);
-          glDrawArrays (GL_TRIANGLES, op->draw.vao_offset, op->draw.draw_size);//GL_N_VERTICES);
+                    op->draw.vao_offset, op->draw.vao_size, program->name);
+          glDrawArrays (GL_TRIANGLES, op->draw.vao_offset, op->draw.vao_size);//GL_N_VERTICES);
           break;
 
         default:
index 3a001af879610568d33d5b458ffcf5deb97accfc..93e7ad250c1891898d78407be540abe96c4bfe4d 100644 (file)
@@ -228,7 +228,7 @@ ops_draw (RenderOpBuilder     *builder,
       RenderOp new_draw;
       new_draw.op = OP_DRAW;
       new_draw.draw.vao_offset = last_op->draw.vao_offset;
-      new_draw.draw.draw_size = last_op->draw.draw_size + GL_N_VERTICES;
+      new_draw.draw.vao_size = last_op->draw.vao_size + GL_N_VERTICES;
 
       last_op->op = OP_CHANGE_VAO;
       memcpy (&last_op->vertex_data, vertex_data, sizeof(GskQuadVertex) * GL_N_VERTICES);
@@ -247,7 +247,7 @@ ops_draw (RenderOpBuilder     *builder,
 
       op.op = OP_DRAW;
       op.draw.vao_offset = offset;
-      op.draw.draw_size = GL_N_VERTICES;
+      op.draw.vao_size = GL_N_VERTICES;
       g_array_append_val (builder->render_ops, op);
     }
 
index fee25af75cf4430a30d2c262d62fc0e9ddb109c6..12d68b245df59d0dae5d63f73688868499a24ad2 100644 (file)
@@ -97,8 +97,9 @@ typedef struct
     } linear_gradient;
     struct {
       gsize vao_offset;
-      gsize draw_size;
+      gsize vao_size;
     } draw;
+
   };
 } RenderOp;